-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
resprites all soda cans, adds wellcheers juice #77424
Conversation
The six pack sprite has definitely needed some love, thank you for your service |
shit i should've had a before after for that one too lmao |
a lot of these i dont get the changes. changing the 4th one to be some weird symbol rather than steam coming out of a drink? changing the 6th one to be fire? changing the 9th one to remove the balloon and just have a random line? changing the 11th one to just be like a sun rather than what appears to be something implying a race? the 16th one is too boring now. these ones are just downgrades or misinterpretations of what it was, not even arguing for "soul" (although the old sprites arent even bad) |
the ones you're mentioning are literally so vague i could not parse them when redesigning them. i'm not even sure you know what they're meant to represent? |
which is the before and which is the after genuine question |
top is before bottom is after |
It's Canada Dry, it looks like the can. The creator of the ginger ale would prefer that it remain modeled after Canada Dry |
no offense to the creator but i'm personally much more fond of the sun design than i would be making it a reference to a real world product. |
the new one looks lower effort. it stands out as being plainer than all of the other new cans. a lot of the sodas are based on real drinks and have designs that reflect that. it's part of the point of it all, making signs and symbols that relate to irl things so they are comprehendible. |
why the shamblers juice became neon green |
yeah i agree, i didnt want to be the one that said it but it looks very lazy and low-effort, its barely even a design, its just some dots and a circle and doesnt look like itd resemble anything, maybe some cleaning spray i guess (i get that its very limited pixels but its not an excuse) |
Big + on the new drink, it has cute effects that change depending on the mood. I'm a big fan of small little tricks you can pick up like that, and having it have small yet so variable effects on your mood just feels right and satisfying. Honestly makes me want to add effects to all the other bland, boring space cola cans that don't do anything. |
The 'new' sol dry sprite is fine. It looks nice and clean, if maybe a bit lacking in detail, but the old one is pretty much completely unintelligible and a pixellated mess because, shocker, real life elaborate can designs designed to catch your attention don't translate to tiny 4x8 pixel art. Let's not nitpick what every single Can looks like? |
it's the eldritch version (which was already green), the og shamblers is still ourple |
also the sol dry is my favorite new logo of the lot so callin' it low effort is not really swaying me on redesigning it, i'll be honest. sometimes a simpler design is better. not everything has to exactly resemble an irl product in this sci fi game set 500 yrs in the future |
why are a few slightly different cans so controversial |
"i like it" isnt really an argument, at all, just because you like it doesnt make it good, or change the fact that its boring and low-effort |
I think it's pretty neat tbh canada dry looks boring |
since I did the resprite, you would have to convince me that it's worth changing due to your complaints for me to actually bother with it. and like I said, no matter how boring or low effort you think it is, I like it. as long as y'all keep trying to tear it down, I'll be satisfied with it, so maybe change your plan of attack or take up sprite art if you want something different. |
## About The Pull Request this one was a labor of love. all the existing soda cans have been resprited, with the help of @retlaw34 (new top palettes), @Imaginos16 (new top shapes, can palettes), and some original sprites done by @Krysonism (monkey energy, the 13 loko). you can see the before and afters here: ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92) (now includes crushed cans, and inhands!) let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made. also adds a new drink, idea courtesy of @YesterdaysPromise: wellcheers juice! ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41) it will make you drowsy, and has a variable affect on your mood if you are unhappy, it will deal stamina damage if you are neutral, it will give you a mood boost if you are happy, it will heal some brute damage also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer? ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49) ## Why It's Good For The Game old can sprites were _crusty_. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished. ## Changelog :cl: add: Added wellcheers, a contraband soda with various side effects. image: resprites all cans in the drinks icon file image: resprites the canholder sprite in storage.dmi /:cl:
…7210) Original PR: tgstation/tgstation#77424 ----- ## About The Pull Request this one was a labor of love. all the existing soda cans have been resprited, with the help of retlaw34 (new top palettes), Imaginos16 (new top shapes, can palettes), and some original sprites done by Krysonism (monkey energy, the 13 loko). you can see the before and afters here: ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92) (now includes crushed cans, and inhands!) let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made. also adds a new drink, idea courtesy of YesterdaysPromise: wellcheers juice! ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41) it will make you drowsy, and has a variable affect on your mood if you are unhappy, it will deal stamina damage if you are neutral, it will give you a mood boost if you are happy, it will heal some brute damage also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer? ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49) ## Why It's Good For The Game old can sprites were _crusty_. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished. ## Changelog :cl: add: Added wellcheers, a contraband soda with various side effects. image: resprites all cans in the drinks icon file image: resprites the canholder sprite in storage.dmi /:cl: --------- Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
…77757) ## About The Pull Request this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with #75988. you can see everything visually changed (other than inhands) in the image below ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. ## Why It's Good For The Game the new martian drinks used the previous style of cans, which was updated in #77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. ## Changelog :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl:
…#77757) ## About The Pull Request this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with #75988. you can see everything visually changed (other than inhands) in the image below ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. ## Why It's Good For The Game the new martian drinks used the previous style of cans, which was updated in #77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. ## Changelog :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl:
this one was a labor of love. all the existing soda cans have been resprited, with the help of @retlaw34 (new top palettes), @Imaginos16 (new top shapes, can palettes), and some original sprites done by @Krysonism (monkey energy, the 13 loko). you can see the before and afters here: ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92) (now includes crushed cans, and inhands!) let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made. also adds a new drink, idea courtesy of @YesterdaysPromise: wellcheers juice! ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41) it will make you drowsy, and has a variable affect on your mood if you are unhappy, it will deal stamina damage if you are neutral, it will give you a mood boost if you are happy, it will heal some brute damage also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer? ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49) old can sprites were _crusty_. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished. :cl: add: Added wellcheers, a contraband soda with various side effects. image: resprites all cans in the drinks icon file image: resprites the canholder sprite in storage.dmi /:cl:
this one was a labor of love. all the existing soda cans have been resprited, with the help of @retlaw34 (new top palettes), @Imaginos16 (new top shapes, can palettes), and some original sprites done by @Krysonism (monkey energy, the 13 loko). you can see the before and afters here: ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92) (now includes crushed cans, and inhands!) let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made. also adds a new drink, idea courtesy of @YesterdaysPromise: wellcheers juice! ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41) it will make you drowsy, and has a variable affect on your mood if you are unhappy, it will deal stamina damage if you are neutral, it will give you a mood boost if you are happy, it will heal some brute damage also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer? ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49) old can sprites were _crusty_. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished. :cl: add: Added wellcheers, a contraband soda with various side effects. image: resprites all cans in the drinks icon file image: resprites the canholder sprite in storage.dmi /:cl:
this one was a labor of love. all the existing soda cans have been resprited, with the help of @retlaw34 (new top palettes), @Imaginos16 (new top shapes, can palettes), and some original sprites done by @Krysonism (monkey energy, the 13 loko). you can see the before and afters here: ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92) (now includes crushed cans, and inhands!) let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made. also adds a new drink, idea courtesy of @YesterdaysPromise: wellcheers juice! ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41) it will make you drowsy, and has a variable affect on your mood if you are unhappy, it will deal stamina damage if you are neutral, it will give you a mood boost if you are happy, it will heal some brute damage also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer? ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49) old can sprites were _crusty_. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished. :cl: add: Added wellcheers, a contraband soda with various side effects. image: resprites all cans in the drinks icon file image: resprites the canholder sprite in storage.dmi /:cl:
[Port] resprites all soda cans, adds wellcheers juice tgstation#77424 + Fix for dirty ice cups
…gstation#77757) this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with tgstation#75988. you can see everything visually changed (other than inhands) in the image below ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. the new martian drinks used the previous style of cans, which was updated in tgstation#77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl:
* Split drinks into different files (tgstation#75898) Splits our nearly 4000 and 1600 line long files. Mostly just moves the glass appearances into their own files. * undoes removals of some bypass restrictions & metabolized_traits related things * removed changes to on_hydroponics_apply() * we had more arguments, missed that * sigh * Martian Food: A Taste of the Red Planet (tgstation#75988) Adds a selection of new foods and drinks based around Mars. More information on Mars can be found here: https://github.com/tgstation/common_core/blob/master/Interesting%20Planets/Human%20Space/The%20Sol%20System.md To summarise for the general audience, Mars is a vital colony of the Terran Federation, having been primarily settled (at least originally) by Cybersun Industries to harvest its lucrative supplies of plasma, the second largest in human space behind Lavaland. This has given Mars a diverse culture evolving from the mostly East Asian colonists, and their food reflects this. Thanks to Melbert for their work on the soup portion of this PR. The food: Martian cuisine draws upon the culinary traditions of East Asia, and adds in fusion cuisine from the later colonists. Expect classics such as ramen, curry, noodles and donburi, as well as new takes on the formula like the Croque-Martienne, Peanut Butter Ice Cream Mochi, and the Kitzushi- chilli cheese and rice inside a fried tofu casing. Oh, and lots of pineapple. The Martians love pineapple: ![image](https://github.com/tgstation/tgstation/assets/58124831/c9ae33a1-e03a-4f94-8ce0-8ad124e88e8d) Also included are some foods for Ethereals, which may or may not be hinting at something I've got planned... The drinks: Four new base drinks make their way to the game, bringing with them a host of new cocktails: enjoy new ventures in bartending with Coconut Rum, Shochu/Soju, Yuyake (our favourite legally-distinct melon liqueur), and Mars' favourite alcoholic beverage, rice beer. Each is available in the dispenser, as well as bottles in the booze-o-mat: ![image](https://github.com/tgstation/tgstation/assets/58124831/914a6e2a-7ef5-4791-ae31-d08fa9211083) The recipes: To make your (and the wiki editors) lives easier, please find below the recipes for both foods and drinks: Food: https://hackmd.io/@EOBGames/BkVFU0w9Y Drinks: https://hackmd.io/@EOBGames/rJ1OhnsJ2 Another lot of variety for the chef and bartender, as well as continuing the work started with lizard and moth food in getting Common Core into the game in a tangible and fun way. :cl: EOBGames, MrMelbert add: Mars celebrates the 250th anniversary of the Martian Concession this year, and this has brought Martian cuisine to new heights of popularity. Find a new selection of Martian foods and drinks available in your crafting menu today! /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> * updates martian can sprites, fixes misc text and bugs in wellcheers (tgstation#77757) this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with tgstation#75988. you can see everything visually changed (other than inhands) in the image below ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. the new martian drinks used the previous style of cans, which was updated in tgstation#77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl: * Removing enriched liquid electricity references * look, icons are hard * boiled rice now needs to be boiled and recipe guide for boiled spaghetti/rice * martian hotfix (tgstation#77562) ## About The Pull Request Fixes a few issues with Martian food. Makes stuff that's cooked on the grill or oven not burn, and adds guide recipes for the non-crafting-menu stuff. ## Why It's Good For The Game Fixes some problems, removes some confusion ## Changelog :cl: fix: a few issues with Martian food /:cl: * removed references to butter slices for now * Change from improvised medicine * better block comment formating --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
* Split drinks into different files (tgstation#75898) Splits our nearly 4000 and 1600 line long files. Mostly just moves the glass appearances into their own files. * undoes removals of some bypass restrictions & metabolized_traits related things * removed changes to on_hydroponics_apply() * we had more arguments, missed that * sigh * Martian Food: A Taste of the Red Planet (tgstation#75988) Adds a selection of new foods and drinks based around Mars. More information on Mars can be found here: https://github.com/tgstation/common_core/blob/master/Interesting%20Planets/Human%20Space/The%20Sol%20System.md To summarise for the general audience, Mars is a vital colony of the Terran Federation, having been primarily settled (at least originally) by Cybersun Industries to harvest its lucrative supplies of plasma, the second largest in human space behind Lavaland. This has given Mars a diverse culture evolving from the mostly East Asian colonists, and their food reflects this. Thanks to Melbert for their work on the soup portion of this PR. The food: Martian cuisine draws upon the culinary traditions of East Asia, and adds in fusion cuisine from the later colonists. Expect classics such as ramen, curry, noodles and donburi, as well as new takes on the formula like the Croque-Martienne, Peanut Butter Ice Cream Mochi, and the Kitzushi- chilli cheese and rice inside a fried tofu casing. Oh, and lots of pineapple. The Martians love pineapple: ![image](https://github.com/tgstation/tgstation/assets/58124831/c9ae33a1-e03a-4f94-8ce0-8ad124e88e8d) Also included are some foods for Ethereals, which may or may not be hinting at something I've got planned... The drinks: Four new base drinks make their way to the game, bringing with them a host of new cocktails: enjoy new ventures in bartending with Coconut Rum, Shochu/Soju, Yuyake (our favourite legally-distinct melon liqueur), and Mars' favourite alcoholic beverage, rice beer. Each is available in the dispenser, as well as bottles in the booze-o-mat: ![image](https://github.com/tgstation/tgstation/assets/58124831/914a6e2a-7ef5-4791-ae31-d08fa9211083) The recipes: To make your (and the wiki editors) lives easier, please find below the recipes for both foods and drinks: Food: https://hackmd.io/@EOBGames/BkVFU0w9Y Drinks: https://hackmd.io/@EOBGames/rJ1OhnsJ2 Another lot of variety for the chef and bartender, as well as continuing the work started with lizard and moth food in getting Common Core into the game in a tangible and fun way. :cl: EOBGames, MrMelbert add: Mars celebrates the 250th anniversary of the Martian Concession this year, and this has brought Martian cuisine to new heights of popularity. Find a new selection of Martian foods and drinks available in your crafting menu today! /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> * updates martian can sprites, fixes misc text and bugs in wellcheers (tgstation#77757) this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with tgstation#75988. you can see everything visually changed (other than inhands) in the image below ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. the new martian drinks used the previous style of cans, which was updated in tgstation#77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl: * Removing enriched liquid electricity references * look, icons are hard * boiled rice now needs to be boiled and recipe guide for boiled spaghetti/rice * martian hotfix (tgstation#77562) ## About The Pull Request Fixes a few issues with Martian food. Makes stuff that's cooked on the grill or oven not burn, and adds guide recipes for the non-crafting-menu stuff. ## Why It's Good For The Game Fixes some problems, removes some confusion ## Changelog :cl: fix: a few issues with Martian food /:cl: * removed references to butter slices for now * Change from improvised medicine * better block comment formating * T (tgstation#77442) ## About The Pull Request Adds T, basically a boosted tea for mimes. Can be made by mixing Nothing with Tea, trading off the brute healing for toxin & drowsiness healing. ![dinky-export2](https://github.com/tgstation/tgstation/assets/66052067/8a81f719-8fd8-4dd2-be74-58ff2442ce94) ## Why It's Good For The Game https://github.com/tgstation/tgstation/assets/66052067/9df3ee77-ff45-49ce-a56d-59004e4b308c ## Changelog :cl: Wallem add: T /:cl: * Fixes silliness involving soup pots clearing ingredients list (tgstation#74882) Fixes tgstation#74866 The issue is misleading, it never deleted the disk. The disk remained in the pot's contents but was no longer tracked as an ingredient, leaving it stuck Foolishly I had a case for indestructible things when soup reactions finished, where it wouldn't delete stuff like the disk. But I never removed it from the pot. I just nulled the ingredients list. Oops. So pots will drop ingredients that fail to cook into anything when the reaction finishes. --- Semi-unrelated but stuff like stoves, ovens, and chem heater should probably `allowdrop() return FALSE`. I cannot think of many (any) situations where you would want to use `drop_location` from something in an oven, stove, or heater and actually want those returned rather than their own loc. Whoops :cl: Melbert fix: Ingredients which fail to react in soup reactions drop when the reaction finishes as intended /:cl: * Adds the Death Sandwich to the game (tgstation#75013) Adds the Death Sandwich to the game, the ultimate form of bread-conveyed-meat-based consumables. ![deathsandwich](https://user-images.githubusercontent.com/66052067/235041733-287be1fd-1eed-4d6d-840b-96f95494f093.png) And remember; Eat it right, or you die! I'm genuinely surprised we don't already have a meatball sub in the game also I love humor food, and I doubt my edition of the Eggcellent Challenge would ever be merged if I tried to do so, so this is the next best thing. :cl: Wallem add: The ancient recipe for the Death Sandwich has been rediscovered buried in the deepest depths of an erupting volcano. /:cl: * Wedding Cakes (tgstation#75076) ## About The Pull Request Added wedding cakes, which are sliceable into wedding cake slices. Mechanically, they are just worse pound cakes - they require more ingredients and provide less nutrients - but they are here for the flavor. Sometimes a pound cake just doesn't suffice when you want to roleplay a wedding. Fair warning, I've not done a pull request here before, any advice welcome. <img src='https://user-images.githubusercontent.com/102194057/235379312-2eaecffa-c48f-45b6-a3c6-09bf4bbff14a.png'> ## Why It's Good For The Game Roleplayers like weddings, and what is a wedding without a cake? (This PR was originally made for Skyrat but they recommended I take it upstream). ## Changelog :cl: add: Added wedding cakes /:cl: --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> * Adds a var to chemical reactions that allows them to take place in subtypes of their required container (tgstation#75527) ## About The Pull Request As the title may imply, a variable has been added to chemical reactions that'll make them check istype on the required container, rather than looking for the exact type path. ## Why It's Good For The Game In my specific example, lets say I want to have sybtypes of soup pots. The current behavior doesn't allow for these subtypes of soup pots to actually make soup, which is sub-optimal. ## Changelog :cl: code: A var has been added to chemical reactions (defaulted to FALSE to keep current behavior) that allows subtypes of that reactions required container to be used as well, rather than the exact type. /:cl: * adds toast sandwich (tgstation#75545) ## About The Pull Request Adds toast sandwich to the game. ![image](https://github.com/tgstation/tgstation/assets/32695675/6860aff1-7dde-4e0b-9ed8-a4343cf3f115) ## Why It's Good For The Game Gives our UK players a little taste of home :) Also it's funny ## Changelog :cl: Epoc add: Toast sandwich /:cl: --------- Co-authored-by: alec-b-williams <alec.b.williams@wsu.edu> Co-authored-by: alec-b-williams <78933704+alec-b-williams@users.noreply.github.com> * Fixes a little inconsistency with the peanut butter banana sandwich and makes sandwiches subtypes of the generic sandwhich. (tgstation#75750) The peanut butter banana sandwich is presented ingame as grilled when it doesn't require a griddle to make. Also, I'm taking the opportunity to repath the sandwich types, since they all share the same weight class, food flags and icons file. This will fix tgstation#74585. :cl: fix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make. /:cl: * Map changes needed for sandwich refactor * i really need to find a better way to do this * Modify death sandwich disease to work with pathology * Blood brothers can now chose the death sandwich recipe as their gear * the cure should be shown somewhere in game, that was dumb of me * changed our boiling recipes that output items to match 24-volt fist * wedding cake can feed a small wedding party --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com> Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com> Co-authored-by: Thlumyn <102194057+Thlumyn@users.noreply.github.com> Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Co-authored-by: Epoc <32695675+epochayur@users.noreply.github.com> Co-authored-by: alec-b-williams <alec.b.williams@wsu.edu> Co-authored-by: alec-b-williams <78933704+alec-b-williams@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: dwasint <82520990+dwasint@users.noreply.github.com>
About The Pull Request
this one was a labor of love. all the existing soda cans have been resprited, with the help of @retlaw34 (new top palettes), @Imaginos16 (new top shapes, can palettes), and some original sprites done by @Krysonism (monkey energy, the 13 loko).
![image](https://private-user-images.githubusercontent.com/110322848/259265445-f23f0b06-d3b3-40dd-b0f9-353fb5864b92.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjE0NDE0NTgsIm5iZiI6MTcyMTQ0MTE1OCwicGF0aCI6Ii8xMTAzMjI4NDgvMjU5MjY1NDQ1LWYyM2YwYjA2LWQzYjMtNDBkZC1iMGY5LTM1M2ZiNTg2NGI5Mi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNzIwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDcyMFQwMjA1NThaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT05M2I1YWRiZmY4ZDg4ZmYzMTQwMDc4NTUxMDg3NzZjZDY4MWU3ZGJlZDQwOGM0YzcyZjU3ZDZhM2UxZTU5MTdmJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.mKxsPcIqK7lHu_fblkfzDGeBVv_RwC6mcZHvZ6kg2RM)
you can see the before and afters here:
(now includes crushed cans, and inhands!)
let me know if there's any promotional stuff i should also include in this PR, like if sol dry has a poster somewhere, and i'll go update that with any changes made.
also adds a new drink, idea courtesy of @YesterdaysPromise:
![image](https://private-user-images.githubusercontent.com/110322848/258828025-96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjE0NDE0NTgsIm5iZiI6MTcyMTQ0MTE1OCwicGF0aCI6Ii8xMTAzMjI4NDgvMjU4ODI4MDI1LTk2YzZkNTdhLTc5YzMtNGI3MC04YmQ1LWM4ZjNkMWJiZWM0MS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNzIwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDcyMFQwMjA1NThaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1jMWM2YjcyODEzMmQyNDE4OWQ0OThjOTkzYmRmZTk1YTc5MzJmN2YzM2U1NDdiMTVjZWQ2MDhiNjYwODg0Yzg5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.tzs8N_60vqy4nKEm4y3lUAgeob8vmbOOFtchVmaguVY)
wellcheers juice!
it will make you drowsy, and has a variable affect on your mood
if you are unhappy, it will deal stamina damage
if you are neutral, it will give you a mood boost
if you are happy, it will heal some brute damage
also, six packs of cans have been resprited. can i interest anyone in an alamo? or just a space beer?
![image](https://private-user-images.githubusercontent.com/110322848/258833308-567d677b-d89b-4c52-b576-b15293aabf49.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjE0NDE0NTgsIm5iZiI6MTcyMTQ0MTE1OCwicGF0aCI6Ii8xMTAzMjI4NDgvMjU4ODMzMzA4LTU2N2Q2NzdiLWQ4OWItNGM1Mi1iNTc2LWIxNTI5M2FhYmY0OS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNzIwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDcyMFQwMjA1NThaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04MjhlOGI1OGQ5ZDE3NDM2MmJkY2MwYzIyOTY0NzhjMGJhMGFjZmIyNTdjMmUwMjJmOTgwZWQ5OTNiMWZmNjI4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.B5zIk5cHc3Y2ou2ZTsz7GfIf67at8_zi43heFr-S_jg)
Why It's Good For The Game
old can sprites were crusty. it was nearly impossible to tell what some of the logos were, and the palettes were dated as well. this tries to keep the logo similar where possible, giving them new life where i can, and sometimes reimagining them. the result is still internally consistent, but much more polished.
Changelog
🆑
add: Added wellcheers, a contraband soda with various side effects.
image: resprites all cans in the drinks icon file
image: resprites the canholder sprite in storage.dmi
/:cl: